x86 hvm: Remove global 'hap' boot parameter now that their is a

per-domain configuration option.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 954f48e58cc13b6d8bfc6ed3055d1179a3f8fde6..14edc025cb6b3e16906dc27924752c0f9cde5764 100644 (file)
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -51,16 +51,6 @@
 #include <public/version.h>
 #include <public/memory.h>
 
-/*
- * Xen command-line option to allow/disallow hardware-assisted paging.
- * Since the phys-to-machine table of AMD NPT is in host format, 32-bit Xen
- * can only support guests using NPT with up to a 4GB memory map. Therefore
- * we disallow HAP by default on PAE Xen (by default we want to support an
- * 8GB pseudophysical memory map for HVM guests on a PAE host).
- */
-static int opt_hap_permitted = (CONFIG_PAGING_LEVELS != 3);
-boolean_param("hap", opt_hap_permitted);
-
 int hvm_enabled __read_mostly;
 
 unsigned int opt_hvm_debug_level __read_mostly;
@@ -88,12 +78,7 @@ void hvm_enable(struct hvm_function_table *fns)
     hvm_enabled = 1;
 
     if ( hvm_funcs.hap_supported )
-    {
-        if ( !opt_hap_permitted )
-            hvm_funcs.hap_supported = 0;
-        printk("HVM: Hardware Assisted Paging detected %s.\n",
-               hvm_funcs.hap_supported ? "and enabled" : "but disabled");
-    }
+        printk("HVM: Hardware Assisted Paging detected.\n");
 }
 
 void hvm_set_guest_tsc(struct vcpu *v, u64 guest_tsc)

diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index b114de3e800a75727a8d4d83b6e99d3593a618da..3ead6ddb90699218ef0ea6db58458d84a8dbcce6 100644 (file)
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -724,8 +724,7 @@ guest_physmap_add_entry(struct domain *d, unsigned long gfn,
     {
         if ( !test_and_set_bool(d->arch.hvm_domain.amd_npt_4gb_warning) )
             dprintk(XENLOG_WARNING, "Dom%d failed to populate memory beyond"
-                    " 4GB: specify 'nohap' Xen boot parameter, or 'hap=0' "
-                    "domain config option.\n",
+                    " 4GB: specify 'hap=0' domain config option.\n",
                     d->domain_id);
         return -EINVAL;
     }